From 885c7faf45038ca120fb971496c1816cb71d22e3 Mon Sep 17 00:00:00 2001
From: oliskoli <oliskoli@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Mon, 10 Oct 2005 21:53:17 +0000
Subject: [PATCH] Added input line for format specific options

---
 gpsbabel/win32/gui-2/GPSBabelGUI2.dof |  10 ++++----
 gpsbabel/win32/gui-2/main.dfm         | Bin 22480 -> 23493 bytes
 gpsbabel/win32/gui-2/main.pas         |  33 ++++++++++++++++++--------
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/gpsbabel/win32/gui-2/GPSBabelGUI2.dof b/gpsbabel/win32/gui-2/GPSBabelGUI2.dof
index 2c7bc906e..e6cb653b0 100644
--- a/gpsbabel/win32/gui-2/GPSBabelGUI2.dof
+++ b/gpsbabel/win32/gui-2/GPSBabelGUI2.dof
@@ -2,7 +2,7 @@
 A=0
 B=0
 C=0
-D=0
+D=1
 E=0
 F=0
 G=1
@@ -10,7 +10,7 @@ H=1
 I=0
 J=1
 K=0
-L=0
+L=1
 M=0
 N=1
 O=1
@@ -23,7 +23,7 @@ U=0
 V=0
 W=0
 X=1
-Y=0
+Y=2
 Z=1
 ShowHints=0
 ShowWarnings=0
@@ -56,7 +56,7 @@ IncludeVerInfo=1
 AutoIncBuild=0
 MajorVer=0
 MinorVer=2
-Release=0
+Release=1
 Build=0
 Debug=0
 PreRelease=1
@@ -68,7 +68,7 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=GPSBabel Makers
 FileDescription=GPSBabel Windows Frontend
-FileVersion=0.2.0.0
+FileVersion=0.2.1.0
 InternalName=GPSBabelGUI-2
 LegalCopyright=(C) 2005 Olaf Klein (O.B.Klein@T-Online.de)
 LegalTrademarks=
diff --git a/gpsbabel/win32/gui-2/main.dfm b/gpsbabel/win32/gui-2/main.dfm
index ae0b69b3c1c75e2fd9f032f2bd0dd1fbaa829a3f..ce272a25ced1a6acfa05cbf2f3c591ebd439c1cc 100644
GIT binary patch
delta 1438
zcmbtU&ubGw6rP!FcQ?Bm$wAR-V^s=mX{AP?=`TrRNoZ<fpjq03BIL)^gs#~onc&U6
z<|^;tKj2YNv!GbP9z+oFpf^!3{sBVu;7#jpcQ@KtNu;y9nVmP^_q}<KnR)vFzkGs2
zI}%cpE166@bp@RZSy%6b!Y9g@Q+0#eLj7x%5-W3?gkPeS8)e45d9+l-a;rUW!ecy5
zWMXaOpIDTM!y_r{J9mxX1mt*%N8u@-#s=`hxXG*Oe1U4RR!CKi2Fn_(-j}B9j7#nY
zB%^LTGVFyTL18g(u!>&g1siOSbtS168}&uK%4)hM$h6c}LdcU>v_iJQ_R)_K<9`Dv
zwDemGCWQ%U*sIAW1X*baR>cJ{WeL6rr=^X~r4cN`Z7~{H_7?8JbMXQe;G4LPcmLtF
zAj91N#Rz@`QZ{;1*}xoF(%j#1MsOcomsj>inUF;_U&z)<v_>QdDG{u~yTCZ+p{iWQ
z%eLOFv3@mCs<1yx<rZCci|!|MAHkM*{%k)&E@4mVdl-J6E(6Oj84OEJ|FE>I)u0x{
z056W$%-KGKrfj>EaeAjs**0oh$TN&i*?)HP*4>HQ@1O&I=0OEKzQ3t%+v&u`971RN
zm&iUi_<SY-;pjXJOfSH|%skmaaCCN7_9bizY{$YdGk3V{v)3RLkC;BDml3t|bhhi7
z!}I;UX!sb9V|tRlyZhJ~taIL7!9}>dm0sb!<G>mm!C$S9gU86phwbCuehc3t!M=+*
zrW+!NL$9PJ_O5-)`Y?1cIu=kfwAx59dQ(VNG)8L?K3;SlHQ`Xc=z4NgqeTWs)}H+W
Dj&=XV

delta 673
zcmX@Qo$<nYMuGoa3?XhozP^s0ehdZz`@$y*$V%^KWDdzMV7|)08lIU_lEK{0#O9Hj
znVwO?JZqyzG9!0AoIii^Hbx7k8;qMjF#coYxB=G3RJ8dUa|{z>-sE7mR7Ty&JK1~~
z!zZ(`Yft{juEnJZHM5g(@<lHB$zGiDlV@_PGcr!%l$hMYq0JS9Reo|dhvZ}lPI=B^
zsC40E2To%~=E)_TX^apy!(@K0d`6bZ^<18eoRk0YWHYi(Hs!X)Wg*+-gWN$_Y?I*f
zEJ@9Uc$bNnBP21&zbGZOh>3l22#+CS?c_EdZAOmCn|Qn#i-DGuPd4I{=9&)+sQS&}
zd^x;~36qaV7fse?YMLw{z+P{R0_^`A|2GB_Gbfv~0}12u`p@;B%ZrUIXBseA&NMbQ
zFaHjNKrJ(;vje4#feMO&(#AjqAZd^SbC5Jp0q0~eU0h!brVSav6i~r`Fk>R)WDs2s
z6tMpcWLQpMfEWNY0i<FkkUtqn1I;t9|BU1SkQ0y`SZrKu40ZufE%AWUuQb;^r?Mbp
ta;<_K<G#&v6eO5LkHZ5Bo`U)rCSOuI!4<{`joA9lOO$QRC-X$_1OTVn&MN=_

diff --git a/gpsbabel/win32/gui-2/main.pas b/gpsbabel/win32/gui-2/main.pas
index 7bea74ab4..38c5d5130 100644
--- a/gpsbabel/win32/gui-2/main.pas
+++ b/gpsbabel/win32/gui-2/main.pas
@@ -80,6 +80,11 @@ type
     N1: TMenuItem;
     mnuOptions: TMenuItem;
     mnuSynthesizeShortNames: TMenuItem;
+    edInputOpts: TEdit;
+    lbInputOpts: TLabel;
+    lbOutputOpts: TLabel;
+    edOutputOpts: TEdit;
+    Filter1: TMenuItem;
     procedure FormShow(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure OpenButtonClick(Sender: TObject);
@@ -195,14 +200,14 @@ begin
 
   FixAlign(sbOpenFile, 8);
   FixAlign(sbSaveFile, 8);
-  FixAlign(cbInputFormat, 8);
-  FixAlign(cbInputFormatDevice, 8);
-  FixAlign(cbOutputFormat, 8);
+  edInputOpts.Left := lbInputOpts.Left + lbInputOpts.Width + 8;
+  edOutputOpts.Left := lbOutputOpts.Left + lbOutputOpts.Width + 8;
+  FixAlign(edInputOpts, 8);
+  FixAlign(edOutputOpts, 8);
   FixAlign(btnProcess, 8);
   FixAlign(btnFilter, 16, btnProcess);
   FixAlign(edInputFile, 8, sbOpenFile);
   FixAlign(edOutputFile, 8, sbSaveFile);
-  FixAlign(cbOutputFormatDevice, 8);
 end;
 
 procedure TfrmMain.LoadFileFormats;
@@ -233,7 +238,7 @@ procedure TfrmMain.WMSTARTUP(var Msg: TMessage);
 begin
   LoadVersion;
   LoadFileFormats;
-  
+
   // ? valid README form
 
   acHelpReadme.Enabled := (frmReadme.Memo.Lines.Count > 0);
@@ -401,7 +406,7 @@ begin
   if cbWaypoints.Checked then cmdline := cmdline + ' -w';
   if cbRoutes.Checked then cmdline := cmdline + ' -r';
   if cbTracks.Checked then cmdline := cmdline + ' -t';
-  
+
   if mnuSynthesizeShortNames.Checked then cmdline := cmdline + ' -s';
 
   if chbInputDevice.Checked then
@@ -413,8 +418,12 @@ begin
     s := '"' + s + '"';
   end;
 
-  cmdline := Format('%s -i %s -f %s',
-    [ cmdline, IFormat, s]);
+  if (Trim(edInputOpts.Text) <> '') then
+    cmdline := Format('%s -i %s,%s -f %s',
+      [cmdline, IFormat, Trim(edInputOpts.Text), s])
+  else
+    cmdline := Format('%s -i %s -f %s',
+      [cmdline, IFormat, s]);
 
   cmdline := cmdline + frmFilter.CmdLine;
 
@@ -437,8 +446,12 @@ begin
     s := '"' + s + '"';
   end;
 
-  cmdline := Format('%s -o %s -F %s',
-    [ cmdline, OFormat, s]);
+  if (Trim(edOutputOpts.Text) <> '') then
+    cmdline := Format('%s -o %s,%s -F %s',
+      [cmdline, OFormat, Trim(edOutputOpts.Text), s])
+  else
+    cmdline := Format('%s -o %s -F %s',
+      [cmdline, OFormat, s]);
 
   while (cmdline[1] = ' ') do System.Delete(cmdline, 1, 1);
 
-- 
2.30.2